Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 6 Feb 2010 04:13:19 +0000 (04:13 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 6 Feb 2010 04:13:19 +0000 (04:13 +0000)

Trivial merge